Use GTK_DATADIR/{icons,pixmaps} instead of

Thu Nov 13 01:46:32 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkicontheme.c (gtk_icon_theme_init): Use
	GTK_DATADIR/{icons,pixmaps} instead of
	GTK_DATA_PREFIX/{icons,pixmaps}.  (#123365, Marco Pesenti Gritti)

diff --git a/ChangeLog b/ChangeLog
index ed0504084325258b39e6e1b9e9a65c2dd4719115..79c74a93bdbce1a469414d976b1c302b31c87824 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 13 01:46:32 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_init): Use 
+       GTK_DATADIR/{icons,pixmaps} instead of 
+       GTK_DATA_PREFIX/{icons,pixmaps}.  (#123365, Marco Pesenti Gritti)
+
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
        Changes to improve menu positioning on Xinerama (#108328, #126150):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ed0504084325258b39e6e1b9e9a65c2dd4719115..79c74a93bdbce1a469414d976b1c302b31c87824 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Nov 13 01:46:32 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_init): Use 
+       GTK_DATADIR/{icons,pixmaps} instead of 
+       GTK_DATA_PREFIX/{icons,pixmaps}.  (#123365, Marco Pesenti Gritti)
+
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
        Changes to improve menu positioning on Xinerama (#108328, #126150):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ed0504084325258b39e6e1b9e9a65c2dd4719115..79c74a93bdbce1a469414d976b1c302b31c87824 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Nov 13 01:46:32 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_init): Use 
+       GTK_DATADIR/{icons,pixmaps} instead of 
+       GTK_DATA_PREFIX/{icons,pixmaps}.  (#123365, Marco Pesenti Gritti)
+
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
        Changes to improve menu positioning on Xinerama (#108328, #126150):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ed0504084325258b39e6e1b9e9a65c2dd4719115..79c74a93bdbce1a469414d976b1c302b31c87824 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Nov 13 01:46:32 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_init): Use 
+       GTK_DATADIR/{icons,pixmaps} instead of 
+       GTK_DATA_PREFIX/{icons,pixmaps}.  (#123365, Marco Pesenti Gritti)
+
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
        Changes to improve menu positioning on Xinerama (#108328, #126150):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ed0504084325258b39e6e1b9e9a65c2dd4719115..79c74a93bdbce1a469414d976b1c302b31c87824 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Nov 13 01:46:32 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_init): Use 
+       GTK_DATADIR/{icons,pixmaps} instead of 
+       GTK_DATA_PREFIX/{icons,pixmaps}.  (#123365, Marco Pesenti Gritti)
+
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
        Changes to improve menu positioning on Xinerama (#108328, #126150):

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 4ca4a210fb44460bd02b9695132c029fd008f1ef..f9f5070826f804b781ca893820c8810f2d37e0ce 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -532,8 +532,8 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
   priv->search_path[0] = g_build_filename (g_get_home_dir (),
                                           ".icons",
                                           NULL);
-  priv->search_path[1] = g_build_filename (GTK_DATA_PREFIX, "pixmaps", NULL);
-  priv->search_path[2] = g_build_filename (GTK_DATA_PREFIX, "icons", NULL);
+  priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL);
+  priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL);
   priv->search_path[3] = g_strdup ("/usr/share/icons");
   priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
   priv->search_path_len = 5;